Tegra: group platform settings together

This patch groups all the platform configuration macros into
the common platform.mk makefile.

Signed-off-by: Varun Wadekar <[email protected]>

diff --git a/plat/nvidia/tegra/common/tegra_common.mk b/plat/nvidia/tegra/common/tegra_common.mk
index e8e25ef0a4bda273ad1c68c069ec4030ee85579f..cb4d1886303afdd542e435c8f26d4fb43c9296fa 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_common.mk
+++ b/plat/nvidia/tegra/common/tegra_common.mk
@@ -28,19 +28,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-CRASH_REPORTING                :=      1
-$(eval $(call add_define,CRASH_REPORTING))
-
-ASM_ASSERTION          :=      1
-$(eval $(call add_define,ASM_ASSERTION))
-
-USE_COHERENT_MEM       :=      0
-
-SEPARATE_CODE_AND_RODATA :=    1
-
-PLAT_XLAT_TABLES_DYNAMIC :=    1
-$(eval $(call add_define,PLAT_XLAT_TABLES_DYNAMIC))
-
 PLAT_INCLUDES          :=      -Iplat/nvidia/tegra/include/drivers \
                                -Iplat/nvidia/tegra/include \
                                -Iplat/nvidia/tegra/include/${TARGET_SOC}

diff --git a/plat/nvidia/tegra/platform.mk b/plat/nvidia/tegra/platform.mk
index 2eeffca74c20e2d351c194396ef03e6f5c950714..5f7e8c8f64584225fdb9ac5e8b334e096a523794 100644 (file)
--- a/plat/nvidia/tegra/platform.mk
+++ b/plat/nvidia/tegra/platform.mk
@@ -30,12 +30,30 @@
 
 SOC_DIR                        :=      plat/nvidia/tegra/soc/${TARGET_SOC}
 
-# Enable PSCI v1.0 extended state ID format
-PSCI_EXTENDED_STATE_ID :=      1
+# enable ASM_ASSERTION for the build
+ASM_ASSERTION          :=      1
+$(eval $(call add_define,ASM_ASSERTION))
+
+# dump the state on crash console
+CRASH_REPORTING                :=      1
+$(eval $(call add_define,CRASH_REPORTING))
 
 # Disable the PSCI platform compatibility layer
 ENABLE_PLAT_COMPAT     :=      0
 
+# enable dynamic memory mapping
+PLAT_XLAT_TABLES_DYNAMIC :=    1
+$(eval $(call add_define,PLAT_XLAT_TABLES_DYNAMIC))
+
+# Enable PSCI v1.0 extended state ID format
+PSCI_EXTENDED_STATE_ID :=      1
+
+# code and read-only data should be put on separate memory pages
+SEPARATE_CODE_AND_RODATA :=    1
+
+# do not use coherent memory
+USE_COHERENT_MEM       :=      0
+
 include plat/nvidia/tegra/common/tegra_common.mk
 include ${SOC_DIR}/platform_${TARGET_SOC}.mk